From 10d5705b70461576c6227d046132a71c5af9f80b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Jan 2021 23:07:55 -0500 Subject: [PATCH] Reduce use of GtkStyleContext Remove some unnecessary uses of GtkStyleContext where we can directly go to the GtkCssStyle, and and drop unnnecessary includes. --- gtk/gtkbox.c | 1 - gtk/gtkbuiltinicon.c | 9 +++++---- gtk/gtkcalendar.c | 1 - gtk/gtkcheckbutton.c | 2 +- gtk/gtkcolorswatch.c | 1 - gtk/gtkcssinheritvalue.c | 2 +- gtk/gtkcssprovider.c | 1 - gtk/gtkcssshadowvalue.c | 1 - gtk/gtkentry.c | 1 - gtk/gtkexpander.c | 1 - gtk/gtkfilechooserwidget.c | 1 - gtk/gtkfontchooserwidget.c | 1 - gtk/gtkframe.c | 2 -- gtk/gtkgrid.c | 2 +- gtk/gtkiconhelper.c | 1 - gtk/gtkimage.c | 1 - gtk/gtklabel.c | 1 - gtk/gtklevelbar.c | 3 +-- gtk/gtklistbase.c | 1 - gtk/gtkmountoperation.c | 1 - gtk/gtknotebook.c | 1 - gtk/gtkpaned.c | 3 +-- gtk/gtkpasswordentry.c | 2 +- gtk/gtkprogressbar.c | 3 --- gtk/gtkroundedbox.c | 1 - gtk/gtkscale.c | 2 -- gtk/gtkspinbutton.c | 2 -- gtk/gtkspinner.c | 2 +- gtk/gtkswitch.c | 1 - gtk/gtktexthandle.c | 17 +++++++---------- gtk/gtktextutil.c | 5 +---- gtk/gtktextview.c | 12 ++++++------ gtk/gtktreeview.c | 1 - gtk/gtkwidget.c | 1 - gtk/gtkwindow.c | 1 - 35 files changed, 26 insertions(+), 62 deletions(-) diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 074d98d2a3..d30dbfb8bf 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -67,7 +67,6 @@ #include "gtkprivate.h" #include "gtktypebuiltins.h" #include "gtksizerequest.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c index 697b06c387..642b77bd18 100644 --- a/gtk/gtkbuiltinicon.c +++ b/gtk/gtkbuiltinicon.c @@ -20,7 +20,7 @@ #include "config.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkbuiltiniconprivate.h" #include "gtkwidgetprivate.h" @@ -80,10 +80,11 @@ gtk_builtin_icon_measure (GtkWidget *widget, int *minimum_baseline, int *natural_baseline) { - GtkCssValue *icon_size; + GtkCssStyle *style; - icon_size = _gtk_style_context_peek_property (gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_ICON_SIZE); - *minimum = *natural = _gtk_css_number_value_get (icon_size, 100); + style = gtk_css_node_get_style (gtk_widget_get_css_node (widget)); + + *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100); } static void diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 59e43033f4..7083d15726 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -103,7 +103,6 @@ #include "gtkprivate.h" #include "gtkrendericonprivate.h" #include "gtksnapshot.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" #include "gtkgestureclick.h" #include "gtkgesturedrag.h" diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 78a53579bb..afadecd841 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -35,7 +35,7 @@ #include "gtklabel.h" #include "gtkprivate.h" #include "gtkshortcuttrigger.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtkwidgetprivate.h" #include "gtkmodelbuttonprivate.h" diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c index a451fd827f..00e9195a99 100644 --- a/gtk/gtkcolorswatch.c +++ b/gtk/gtkcolorswatch.c @@ -34,7 +34,6 @@ #include "gtkpopovermenu.h" #include "gtkprivate.h" #include "gtksnapshot.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" #include "gtkeventcontrollerkey.h" #include "gtknative.h" diff --git a/gtk/gtkcssinheritvalue.c b/gtk/gtkcssinheritvalue.c index e17482afb9..691e43d2f6 100644 --- a/gtk/gtkcssinheritvalue.c +++ b/gtk/gtkcssinheritvalue.c @@ -20,7 +20,7 @@ #include "gtkcssinheritvalueprivate.h" #include "gtkcssinitialvalueprivate.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssstyleprivate.h" struct _GtkCssValue { GTK_CSS_VALUE_BASE diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index ebbc1a165a..7044dd7b03 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -30,7 +30,6 @@ #include "gtkcssshorthandpropertyprivate.h" #include "gtksettingsprivate.h" #include "gtkstyleprovider.h" -#include "gtkstylecontextprivate.h" #include "gtkstylepropertyprivate.h" #include "gtkstyleproviderprivate.h" #include "gtkmarshalers.h" diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index f66d34205f..19314662e3 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -25,7 +25,6 @@ #include "gtkcssnumbervalueprivate.h" #include "gtkcsscolorvalueprivate.h" #include "gtksnapshotprivate.h" -#include "gtkstylecontextprivate.h" #include "gtkpango.h" #include "gsk/gskcairoblurprivate.h" diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 2626a2ffc7..791886cced 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -54,7 +54,6 @@ #include "gtkprogressbar.h" #include "gtksettings.h" #include "gtksnapshot.h" -#include "gtkstylecontextprivate.h" #include "gtktextprivate.h" #include "gtktexthandleprivate.h" #include "gtktextutil.h" diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 16adad8f44..d7fb46b4d0 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -127,7 +127,6 @@ #include "gtkmarshalers.h" #include "gtkmain.h" #include "gtkprivate.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" #include diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 18d4033892..5674d3cbda 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -66,7 +66,6 @@ #include "gtkshow.h" #include "gtkmain.h" #include "gtkscrollable.h" -#include "gtkstylecontextprivate.h" #include "gtkpopover.h" #include "gtkrevealer.h" #include "gtkspinner.h" diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index 62b0320049..3fef81ea55 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -45,7 +45,6 @@ #include "gtkscrolledwindow.h" #include "gtksearchentry.h" #include "gtkspinbutton.h" -#include "gtkstylecontextprivate.h" #include "gtktextview.h" #include "gtkwidgetprivate.h" #include "gtksettings.h" diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 10b9c818d4..25570c7616 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -31,8 +31,6 @@ #include "gtkintl.h" #include "gtkbuildable.h" #include "gtkwidgetprivate.h" -#include "gtkstylecontextprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtklabel.h" /** diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 4f8d35492e..f5909b7f2f 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -29,7 +29,7 @@ #include "gtkorientable.h" #include "gtkprivate.h" #include "gtksizerequest.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 54b06396f6..e4ff62a3c1 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -26,7 +26,6 @@ #include "gtkcssenumvalueprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssstyleprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkcsstransientnodeprivate.h" #include "gtkiconthemeprivate.h" #include "gtkrendericonprivate.h" diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 5c53a5ede1..4cbc1fd2fa 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -26,7 +26,6 @@ #include "gtkimageprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkiconhelperprivate.h" #include "gtkicontheme.h" #include "gtkintl.h" diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index d520fa0e8e..389a193bc1 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -28,7 +28,6 @@ #include "gtkbuildable.h" #include "gtkbuilderprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkeventcontrollermotion.h" #include "gtkeventcontrollerfocus.h" #include "gtkgesturedrag.h" diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c index a62968b3f1..a44ad4a4e1 100644 --- a/gtk/gtklevelbar.c +++ b/gtk/gtklevelbar.c @@ -124,13 +124,12 @@ #include "gtkbinlayout.h" #include "gtkbuildable.h" #include "gtkbuilderprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkgizmoprivate.h" #include "gtkintl.h" #include "gtklevelbar.h" #include "gtkmarshalers.h" #include "gtkorientable.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c index ed4f84ad2a..ccb9ad23a5 100644 --- a/gtk/gtklistbase.c +++ b/gtk/gtklistbase.c @@ -34,7 +34,6 @@ #include "gtkscrollable.h" #include "gtksingleselection.h" #include "gtksnapshot.h" -#include "gtkstylecontextprivate.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index ae38e671a2..f5380863bd 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -49,7 +49,6 @@ #include "gtkicontheme.h" #include "gtkmain.h" #include "gtksettings.h" -#include "gtkstylecontextprivate.h" #include "gtkdialogprivate.h" #include "gtkgestureclick.h" #include "gtkmodelbuttonprivate.h" diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index bad99cdddc..ac1dbd88fe 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -31,7 +31,6 @@ #include "gtkboxlayout.h" #include "gtkbuildable.h" #include "gtkbutton.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkdroptarget.h" #include "gtkdragicon.h" #include "gtkdropcontrollermotion.h" diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index fccdacd3c0..c15dab86d9 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -27,7 +27,6 @@ #include "gtkpaned.h" #include "gtkcssboxesprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkeventcontrollermotion.h" #include "gtkgesturepan.h" #include "gtkgesturesingle.h" @@ -37,7 +36,7 @@ #include "gtkorientable.h" #include "gtkprivate.h" #include "gtkrendericonprivate.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" #include "gtkcssboxesprivate.h" diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c index 36b2a187ec..28ea5f24e7 100644 --- a/gtk/gtkpasswordentry.c +++ b/gtk/gtkpasswordentry.c @@ -35,7 +35,7 @@ #include "gtkprivate.h" #include "gtkwidgetprivate.h" #include "gtkcsspositionvalueprivate.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" /** diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 30a91d447c..417c4538a0 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -27,15 +27,12 @@ #include "gtkprogressbar.h" #include "gtkboxlayout.h" -#include "gtkcssnumbervalueprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkgizmoprivate.h" #include "gtkintl.h" #include "gtklabel.h" #include "gtkorientable.h" #include "gtkprogresstrackerprivate.h" #include "gtkprivate.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" #include diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c index 9ea6782573..172f58c4d5 100644 --- a/gtk/gtkroundedbox.c +++ b/gtk/gtkroundedbox.c @@ -22,7 +22,6 @@ #include "gtkcsscornervalueprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcsstypesprivate.h" -#include "gtkstylecontextprivate.h" #include diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index b4c2490319..4a38c5d213 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -38,8 +38,6 @@ #include "gtkorientable.h" #include "gtkprivate.h" #include "gtkrangeprivate.h" -#include "gtkstylecontextprivate.h" -#include "gtkstylepropertyprivate.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 7ebe279677..88ae86ad97 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -36,7 +36,6 @@ #include "gtkbox.h" #include "gtkbutton.h" #include "gtkbuttonprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkeditable.h" #include "gtkcelleditable.h" #include "gtkimage.h" @@ -53,7 +52,6 @@ #include "gtkorientable.h" #include "gtkprivate.h" #include "gtksettings.h" -#include "gtkstylecontextprivate.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" #include "gtkboxlayout.h" diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c index 3cf970eab1..3784da40ed 100644 --- a/gtk/gtkspinner.c +++ b/gtk/gtkspinner.c @@ -34,7 +34,7 @@ #include "gtkimage.h" #include "gtkintl.h" #include "gtkprivate.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtkwidgetprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkrendericonprivate.h" diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index cff20c9aa8..d7a8e3a44b 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -70,7 +70,6 @@ #include "gtkprivate.h" #include "gtkprogresstrackerprivate.h" #include "gtksettingsprivate.h" -#include "gtkstylecontextprivate.h" #include "gtkwidgetprivate.h" typedef struct _GtkSwitchClass GtkSwitchClass; diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c index 73bd8d5bcc..33bbc6bf42 100644 --- a/gtk/gtktexthandle.c +++ b/gtk/gtktexthandle.c @@ -26,8 +26,7 @@ #include "gtkwidgetprivate.h" #include "gtkrendericonprivate.h" #include "gtkcssboxesimplprivate.h" -#include "gtkcssnumbervalueprivate.h" -#include "gtkstylecontextprivate.h" +#include "gtkcssnodeprivate.h" #include "gtknativeprivate.h" #include "gtkintl.h" @@ -110,17 +109,15 @@ gtk_text_handle_native_get_surface_transform (GtkNative *native, static void gtk_text_handle_get_padding (GtkTextHandle *handle, - GtkBorder *border) + GtkBorder *padding) { GtkWidget *widget = GTK_WIDGET (handle); - GtkStyleContext *context; - - context = gtk_widget_get_style_context (widget); + GtkCssStyle *style = gtk_css_node_get_style (gtk_widget_get_css_node (widget)); - border->left = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_LEFT), 100); - border->right = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_RIGHT), 100); - border->top = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_TOP), 100); - border->bottom = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_BOTTOM), 100); + padding->left = _gtk_css_number_value_get (style->size->padding_left, 100); + padding->right = _gtk_css_number_value_get (style->size->padding_right, 100); + padding->top = _gtk_css_number_value_get (style->size->padding_top, 100); + padding->bottom = _gtk_css_number_value_get (style->size->padding_bottom, 100); } static void diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c index 3fdb2bc4be..74b3f5cc59 100644 --- a/gtk/gtktextutil.c +++ b/gtk/gtktextutil.c @@ -34,7 +34,6 @@ #include "gtkintl.h" #include "gtkwidgetprivate.h" #include "gtkcssstyleprivate.h" -#include "gtkstylepropertyprivate.h" #include "gtkcsscolorvalueprivate.h" #define DRAG_ICON_MAX_WIDTH 250 @@ -165,7 +164,6 @@ set_attributes_from_style (GtkWidget *widget, GtkTextAttributes *values) { GtkCssStyle *style; - GtkStyleContext *context; const GdkRGBA black = { 0, }; if (!values->appearance.bg_rgba) @@ -173,8 +171,7 @@ set_attributes_from_style (GtkWidget *widget, if (!values->appearance.fg_rgba) values->appearance.fg_rgba = gdk_rgba_copy (&black); - context = gtk_widget_get_style_context (widget); - style = gtk_style_context_lookup_style (context); + style = gtk_css_node_get_style (gtk_widget_get_css_node (widget)); *values->appearance.bg_rgba = *gtk_css_color_value_get_rgba (style->background->background_color); *values->appearance.fg_rgba = *gtk_css_color_value_get_rgba (style->core->color); diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 5a4ad33e2a..6f0bdb18bc 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -48,7 +48,7 @@ #include "gtktypebuiltins.h" #include "gtktextviewchildprivate.h" #include "gtktexthandleprivate.h" -#include "gtkcssstylepropertyprivate.h" +#include "gtkstylecontextprivate.h" #include "gtkpopover.h" #include "gtkmagnifierprivate.h" #include "gtkemojichooser.h" @@ -7491,7 +7491,7 @@ static void gtk_text_view_set_attributes_from_style (GtkTextView *text_view, GtkTextAttributes *values) { - GtkStyleContext *context; + GtkCssStyle *style; const GdkRGBA black = { 0, }; const GdkRGBA *color; @@ -7500,17 +7500,17 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view, if (!values->appearance.fg_rgba) values->appearance.fg_rgba = gdk_rgba_copy (&black); - context = gtk_widget_get_style_context (GTK_WIDGET (text_view)); + style = gtk_css_node_get_style (gtk_widget_get_css_node (GTK_WIDGET (text_view))); - color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)); + color = gtk_css_color_value_get_rgba (style->background->background_color); *values->appearance.bg_rgba = *color; - color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)); + color = gtk_css_color_value_get_rgba (style->core->color); *values->appearance.fg_rgba = *color; if (values->font) pango_font_description_free (values->font); - values->font = gtk_css_style_get_pango_font (gtk_style_context_lookup_style (context)); + values->font = gtk_css_style_get_pango_font (style); } static void diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 267c90b4fa..f6ed73b689 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -28,7 +28,6 @@ #include "gtkcellrenderer.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcsscolorvalueprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkdragsource.h" #include "gtkdragicon.h" #include "gtkdroptargetasync.h" diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 52f5833f0e..3168091367 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -39,7 +39,6 @@ #include "gtkcsspositionvalueprivate.h" #include "gtkcssfontvariationsvalueprivate.h" #include "gtkcssnumbervalueprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkcsswidgetnodeprivate.h" #include "gtkdebug.h" #include "gtkgesturedrag.h" diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 91f6d46989..30f310197a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -36,7 +36,6 @@ #include "gtkcsscornervalueprivate.h" #include "gtkcsscolorvalueprivate.h" #include "gtkcssshadowvalueprivate.h" -#include "gtkcssstylepropertyprivate.h" #include "gtkdroptargetasync.h" #include "gtkeventcontrollerlegacy.h" #include "gtkeventcontrollerkey.h" -- 2.30.2